From 534ab9a9f023673f2d72aa95d28123300e6422a6 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Sun, 8 May 2016 17:36:26 -0300
Subject: [PATCH] placesview: update guiding list of protocols

The previous list of protocols in the guidance popover
was suboptimal and needed adjustments.

This commit updates this list to match the latest mockups [1].

[1] https://raw.githubusercontent.com/gnome-design-team/gnome-mockups/4847c79ea1aaf75046b3ec5bb1b167ac604d86ed/nautilus/nautilus-next/connect-to-server-wire.png

https://bugzilla.gnome.org/show_bug.cgi?id=756570
---
 gtk/ui/gtkplacesview.ui | 42 ++++++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 53d193fcb2..337d493f7c 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -20,9 +20,9 @@
     <child>
       <object class="GtkBox">
         <property name="visible">1</property>
-        <property name="border-width">12</property>
+        <property name="border-width">18</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">12</property>
+        <property name="spacing">6</property>
         <child>
           <object class="GtkLabel">
             <property name="visible">1</property>
@@ -40,9 +40,7 @@
           <object class="GtkLabel">
             <property name="visible">1</property>
             <property name="hexpand">1</property>
-            <property name="label" translatable="yes">Server addresses are made up of a protocol prefix and an address. Examples:
-
-smb://foo.example.com, ssh://192.168.0.1</property>
+            <property name="label" translatable="yes">Server addresses are made up of a protocol prefix and an address. Examples:</property>
             <property name="wrap">1</property>
             <property name="width-chars">40</property>
             <property name="max-width-chars">40</property>
@@ -52,10 +50,24 @@ smb://foo.example.com, ssh://192.168.0.1</property>
             <property name="position">1</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">1</property>
+            <property name="hexpand">1</property>
+            <property name="label" translatable="yes">smb://foo.example.com, ssh://192.168.0.1</property>
+            <property name="wrap">1</property>
+            <property name="width-chars">40</property>
+            <property name="max-width-chars">40</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkGrid">
             <property name="visible">1</property>
-            <property name="margin-top">6</property>
+            <property name="margin-top">12</property>
             <property name="hexpand">1</property>
             <property name="row-spacing">6</property>
             <property name="column-spacing">12</property>
@@ -99,7 +111,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
             <child>
               <object class="GtkLabel">
                 <property name="visible">1</property>
-                <property name="label" translatable="yes">Samba</property>
+                <property name="label" translatable="yes">Network File System</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -110,7 +122,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
             <child>
               <object class="GtkLabel">
                 <property name="visible">1</property>
-                <property name="label" translatable="yes">Secure File Transfer Protocol</property>
+                <property name="label" translatable="yes">Samba</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -121,7 +133,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
             <child>
               <object class="GtkLabel">
                 <property name="visible">1</property>
-                <property name="label" translatable="yes">Secure Shell</property>
+                <property name="label" translatable="yes">SSH File Transfer Protocol</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -168,7 +180,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
             <child>
               <object class="GtkLabel">
                 <property name="visible">1</property>
-                <property name="label">ftp://</property>
+                <property name="label" translatable="yes" comments="Translators: do not translate ftp:// and ftps://">ftp:// or ftps://</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -179,7 +191,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
             <child>
               <object class="GtkLabel">
                 <property name="visible">1</property>
-                <property name="label">smb://</property>
+                <property name="label">nfs://</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -190,7 +202,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
             <child>
               <object class="GtkLabel">
                 <property name="visible">1</property>
-                <property name="label">sftp://</property>
+                <property name="label" translatable="yes">smb://</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -201,7 +213,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
             <child>
               <object class="GtkLabel">
                 <property name="visible">1</property>
-                <property name="label">ssh://</property>
+                <property name="label" comments="Translators: do not translate sftp:// and ssh://">sftp:// or ssh://</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -212,7 +224,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
             <child>
               <object class="GtkLabel">
                 <property name="visible">1</property>
-                <property name="label" translatable="yes" comments="Translators: do not translate http:// and https://">http:// or https://</property>
+                <property name="label" translatable="yes" comments="Translators: do not translate dav:// and davs://">dav:// or davs://</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -222,7 +234,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
             </child>
           </object>
           <packing>
-            <property name="position">2</property>
+            <property name="position">3</property>
           </packing>
         </child>
       </object>
-- 
2.30.2